diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 8c08468..0b05c54 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -274,6 +274,28 @@
 	// --------------------------------------------------------------------
 
 	/**
+	 * Fetch an item from either the GET array or the POST
+	 *
+	 * @access	public
+	 * @param	string	The index key
+	 * @param	bool	XSS cleaning
+	 * @return	string
+	 */
+	function get_post($index = '', $xss_clean = FALSE)
+	{		
+		if ( ! isset($_POST[$index]) )
+		{
+			return $this->get($index, $xss_clean);
+		}
+		else
+		{
+			return $this->post($index, $xss_clean);
+		}		
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
 	 * Fetch an item from the COOKIE array
 	 *
 	 * @access	public
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index bf26a67..39568b9 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -72,6 +72,8 @@
 		<ul>
 			<li>Set the mime type check in the <a href="libraries/file_uploading.html">Upload class</a> to reference the global mimes variable.</li>
 			<li>Added support for query strings to the <a href="libraries/pagination.html">Pagination class</a>, automatically detected or explicitly declared.</li>
+			<li>Added <kbd>get_post()</kbd> to the <a href="libraries/input.html">Input class</a>.</li>
+			<li>Documented <kbd>get()</kbd> in the <a href="libraries/input.html">Input class</a>.</li>
 		</ul>
 	</li>
 	<li>Helpers
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html
index 2cf8b6d..af57a4c 100644
--- a/user_guide/libraries/input.html
+++ b/user_guide/libraries/input.html
@@ -158,6 +158,18 @@
 
 <code>$this->input->post('some_data', TRUE);</code>
 
+<h2>$this->input->get()</h2>
+
+<p>This function is identical to the post function, only it fetches get data:</p>
+
+<code>$this->input->get('some_data', TRUE);</code>
+
+<h2>$this->input->get_post()</h2>
+
+<p>This function will search through both the post and get streams for data, looking first in post, and then in get:</p>
+
+<code>$this->input->get_post('some_data', TRUE);</code>
+
 <h2>$this->input->cookie()</h2>
 
 <p>This function is identical to the post function, only it fetches cookie data:</p>